home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1993 July / InfoMagic USENET CD-ROM July 1993.ISO / sources / x / volume18 / olvwm-3.0 / patch2.01 next >
Encoding:
Internet Message Format  |  1992-07-22  |  50.2 KB
  1. Path: uunet!dtix!darwin.sura.net!mips!msi!dcmartin
  2. From: sdo@soliado.East.Sun.COM (Scott Oaks - Sun Consulting NYC)
  3. Newsgroups: comp.sources.x
  4. Subject: v18i048: olvwm 3.0, Patch2, Part01/04
  5. Message-ID: <1992Jul22.152348.19128@msi.com>
  6. Date: 22 Jul 92 15:23:48 GMT
  7. References: <csx-18i048-olvwm-3.0@uunet.UU.NET>
  8. Sender: dcmartin@msi.com (David C. Martin - Moderator)
  9. Organization: Molecular Simulations, Inc.
  10. Lines: 1578
  11. Approved: dcmartin@msi.com
  12. Originator: dcmartin@fascet
  13.  
  14. Submitted-by: sdo@soliado.East.Sun.COM (Scott Oaks - Sun Consulting NYC)
  15. Posting-number: Volume 18, Issue 48
  16. Archive-name: olvwm-3.0/patch2.01
  17. Patch-To: olvwm-3.0: Volume 15, Issue 167
  18.  
  19. #!/bin/sh
  20. # This is a shell archive (produced by shar 3.50)
  21. # To extract the files from this archive, save it to a file, remove
  22. # everything above the "!/bin/sh" line above, and type "sh file_name".
  23. #
  24. # made 07/22/1992 15:15 UTC by dcmartin@fascet
  25. # Source directory /home/fascet/dcmartin/csx/src
  26. #
  27. # existing files will NOT be overwritten unless -c is specified
  28. #
  29. # This is part 1 of a multipart archive                                    
  30. # do not concatenate these parts, unpack them in order with /bin/sh        
  31. #
  32. # This shar contains:
  33. # length  mode       name
  34. # ------ ---------- ------------------------------------------
  35. # 174178 -rw-r--r-- olvwm3.Patch02
  36. #
  37. if test -r _shar_seq_.tmp; then
  38.     echo 'Must unpack archives in sequence!'
  39.     echo Please unpack part `cat _shar_seq_.tmp` next
  40.     exit 1
  41. fi
  42. # ============= olvwm3.Patch02 ==============
  43. if test -f 'olvwm3.Patch02' -a X"$1" != X"-c"; then
  44.     echo 'x - skipping olvwm3.Patch02 (File already exists)'
  45.     rm -f _shar_wnt_.tmp
  46. else
  47. > _shar_wnt_.tmp
  48. echo 'x - extracting olvwm3.Patch02 (Text)'
  49. sed 's/^X//' << 'SHAR_EOF' > 'olvwm3.Patch02' &&
  50. XFrom: dcmartin@msi.com
  51. Subject: v18i047: OLVWM 3.0, Patch2, Part01/01
  52. Newsgroups: comp.sources.x
  53. Sender: dcmartin@msi.com (David C. Martin - Moderator)
  54. Approved: dcmartin@msi.com
  55. References: <csx-18i047-olvwm-3.0@uunet.UU.NET>
  56. X
  57. Submitted-by: dcmartin@msi.com
  58. Posting-number: Volume 18, Issue 47
  59. Archive-name: olvwm-3.0/patch2
  60. Patch-To: olvwm-3.0: Volume 15, Issue 167
  61. X
  62. ***************
  63. *** 1 ****
  64. ! #define PATCHLEVELv3 1    
  65. --- 1 ----
  66. ! #define PATCHLEVELv3 2
  67. *** BUILD/CHANGES    Sat Jun 13 15:50:59 1992
  68. --- src/CHANGES    Sat Jun 13 15:43:20 1992
  69. ***************
  70. *** 1,3 ****
  71. --- 1,115 ----
  72. + Version 3.2 fixes and enhancements:
  73. +     1) Yet more window placement problems (esp. with mailtool) fixed:  windows
  74. +        now try to keep their mid-points on the same virtual screen rather
  75. +        than their left points; this allows windows to be slightly off the
  76. +        monitor but still on the same screen.
  77. + 
  78. +     2) The AllowMoveIntoDesktop resource now permits you to move windows
  79. +        within the VDM instead of always mapping them to the current screen
  80. + 
  81. +     3) The boolean sense of PointerWorkspace has been changed so that it
  82. +        follows the same semantics of PaintWorkspace:  when PointerWorkspace
  83. +        is True (now the default) olvwm will set the pointer.
  84. + 
  85. +     4) (Some) Typos in the man page fixed
  86. + 
  87. +     5) Internationalization problems fixed
  88. + 
  89. +     6) The VDM menu no longer gets destroyed when the root menu is re-read
  90. + 
  91. +     7) Programs which start with multiple windows (e.g. ftptool) now start
  92. +     in the correct screen.
  93. + 
  94. +     8) More consistent keypad namings:  RowStart, DataStart, and RowEnd
  95. +        mappings no longer affect VDM movement; there are two new keybindings
  96. +        (UpLeft and DownLeft) which achieve that functionality in the VDM.
  97. + 
  98. +     9) (Some) BadWindow warnings and errors are fixed.
  99. + 
  100. +    10) Icons which are off the upper-left screen will be saved properly by
  101. +        the SAVE_WORKSPACE command.
  102. + 
  103. +    11) Using Makefile.sunpro defaults correctly installs the olvwm.info file
  104. + 
  105. +    12) olvwm now beeps in response to an attempt to unstick the VDM
  106. + 
  107. +    13) New resource SortMenuType:
  108. +        If set to Alphabetic (default) then the WINMENU will show windows
  109. +        sorted alphabetically
  110. + 
  111. +        If set to Youngest (previous behaviour) then the WINMENU will show
  112. +        windows from youngest to oldest
  113. + 
  114. +    14) WINMENU now shows only the windows for the current display
  115. + 
  116. +    15) New DIRMENU features:
  117. +        Output is sorted alphabetically
  118. + 
  119. +        Environment variables in the directory path are expanded correctly
  120. + 
  121. +        Can specify a regular expression as the filename to display (but
  122. +        not as the directory)
  123. + 
  124. +    16) A USR1 signal now restart olvwm
  125. + 
  126. +    17) SuspendMouseless and QuoteNextKey keyboard commands are no longer
  127. +        grabbed in basic and sunview1 keyboard mode
  128. + 
  129. +    18) Icon positioning when SnapToGrid is on is fixed
  130. + 
  131. +    19) Popups now map to the same screen as the midpoint of their base frame;
  132. +        if a frame straddles the grid (including if its larger than the
  133. +        physical screen), its popups will now map to whichever virtual screen
  134. +        contains the midpoint of the base frame.
  135. + 
  136. +     20) New resource GrabVirtualKeys:  If this is false (its True by default)
  137. +     then olvwm will not grab all the keys which move you around the VDM;
  138. +     this means the, e.g., VirtualUpLeft will never be active, but
  139. +     UpLeft will still work when the root or the VDM window has the
  140. +     input focus.
  141. + 
  142. +     21) It's now possible to set a myriad of cursors (even in color) for
  143. +     different feedback on the root, frames, buttons, icons, etc.  See
  144. +     the olvwm man page for details on the new cursor resources.
  145. + 
  146. +     22) NoDecor windows no longer respond (as advertised) to front/back,
  147. +     open/close, etc. commands.
  148. + 
  149. +     23) Resize feedback now appears in the correct place in the VDM
  150. + 
  151. +     24) Raise and RaiseLower are now valid actions in olvwmrc 
  152. + 
  153. +     25) New Keybindings:  ToggleDragWindows, ToggleMoveGroups,
  154. +     ToggleSizeFullZoomX, and ToggleSticky to toggle the state of the
  155. +     corresponding resource.
  156. + 
  157. +     26) Repainting the root on exit now depends on the PaintWorkspace resource
  158. + 
  159. +     27) olvwmrc is now re-read whenever it has changed AND olvwm receives a
  160. +     function key keystroke (either normally or through a key it has
  161. +     grabbed).  This option can be disabled by setting VirtualReRead
  162. +     to false (true by default).
  163. + 
  164. +     28)  Four new resources:  NoVirtualKey, NoVirtualFKey, NoVirtualRKey,
  165. +     and NoVirtualLKey.  Each of these is a list of windows (like
  166. +     the VirtualSticky resource) in which the corresponding keys (F, R,
  167. +     L, or all) will not be grabbed when that window has focus.  However,
  168. +     this applies only to keys metioned in the .olvwmrc file; all the
  169. +     normal virtual key interfaces (meta-arrow, e.g.) will still function.
  170. +     It's an interface only a Wall Street trader could love.
  171. + 
  172. +    29)  New Keybinding SaveWorkspace for a key to save the workspace.
  173. + 
  174. +    30)  Synthetic events can now be received by olvwm:  in order to do so,
  175. +     you must start olvwm with the -allowSynthetic option and you must set
  176. +     the SyntheticEvents resource to True.  The SyntheticEvents resource can be
  177. +     toggled to allow/disallow events, but it olvwm only pays attention to it
  178. +     if the -allowSynthetic option is given.
  179. + 
  180. +     31)  Some memory problems fixed
  181. + 
  182. +     32) 2d titles in Click-to-Type or InvertFocusMode are now drawn correctly
  183. + 
  184. X  Version 3.1 fixes:
  185. X      1) Windows/popups/icons should all stay on the same screen better
  186. X  
  187. *** BUILD/Error.c    Sat Jun 13 15:50:07 1992
  188. --- src/Error.c    Sat Jun 13 15:43:20 1992
  189. ***************
  190. *** 4,10 ****
  191. X   *      file for terms of the license.
  192. X   */
  193. X  
  194. ! #ident "@(#)Error.c    1.1 olvwm version 1/3/92"
  195. X  
  196. X  /*
  197. X   * Based on
  198. --- 4,10 ----
  199. X   *      file for terms of the license.
  200. X   */
  201. X  
  202. ! #ident "@(#)Error.c    1.2 olvwm version 6/13/92"
  203. X  
  204. X  /*
  205. X   * Based on
  206. ***************
  207. *** 76,82 ****
  208. X      {0,    ~BWin,    BWin},    /* 18, X_ChangeProperty */
  209. X      {0,    BAll,    0},    /* 19, X_DeleteProperty */
  210. X      {0,    ~BWin,    BWin},    /* 20, X_GetProperty */
  211. !     {0,    BAll,    0},    /* 21, X_ListProperties */
  212. X      {0,    BAll,    0},    /* 22, X_SetSelectionOwner */
  213. X      {0,    BAll,    0},    /* 23, X_GetSelectionOwner */
  214. X      {0,    BAll,    0},    /* 24, X_ConvertSelection */
  215. --- 76,82 ----
  216. X      {0,    ~BWin,    BWin},    /* 18, X_ChangeProperty */
  217. X      {0,    BAll,    0},    /* 19, X_DeleteProperty */
  218. X      {0,    ~BWin,    BWin},    /* 20, X_GetProperty */
  219. !     {0,    BAll,    BWin},    /* 21, X_ListProperties */
  220. X      {0,    BAll,    0},    /* 22, X_SetSelectionOwner */
  221. X      {0,    BAll,    0},    /* 23, X_GetSelectionOwner */
  222. X      {0,    BAll,    0},    /* 24, X_ConvertSelection */
  223. ***************
  224. *** 168,174 ****
  225. X      {0,    BAll,    0},    /* 110, X_ListHosts */
  226. X      {0,    BAll,    0},    /* 111, X_SetAccessControl */
  227. X      {0,    BAll,    0},    /* 112, X_SetCloseDownMode */
  228. !     {0,    BAll,    0},    /* 113, X_KillClient */
  229. X      {0,    BAll,    0},    /* 114, X_RotateProperties */
  230. X      {0,    BAll,    0},    /* 115, X_ForceScreenSaver */
  231. X      {0,    BAll,    0},    /* 116, X_SetPointerMapping */
  232. --- 168,174 ----
  233. X      {0,    BAll,    0},    /* 110, X_ListHosts */
  234. X      {0,    BAll,    0},    /* 111, X_SetAccessControl */
  235. X      {0,    BAll,    0},    /* 112, X_SetCloseDownMode */
  236. !     {0,    BAll,    BWin},    /* 113, X_KillClient */
  237. X      {0,    BAll,    0},    /* 114, X_RotateProperties */
  238. X      {0,    BAll,    0},    /* 115, X_ForceScreenSaver */
  239. X      {0,    BAll,    0},    /* 116, X_SetPointerMapping */
  240. ***************
  241. *** 225,235 ****
  242. X          /*NOTREACHED*/
  243. X      }
  244. X  
  245. X      errBitmask = 1 << event->error_code;
  246. X  
  247. !     if (errBitmask & errorTable[event->request_code].ignore)
  248. X          return 0;
  249. !     else if (errBitmask & errorTable[event->request_code].warning)
  250. X      {
  251. X                 (void) fprintf(stderr, gettext("olvwm: Warning, X Error: %s\n"),
  252. X                                buffer);
  253. --- 225,238 ----
  254. X          /*NOTREACHED*/
  255. X      }
  256. X  
  257. + 
  258. X      errBitmask = 1 << event->error_code;
  259. X  
  260. !     if ((event->request_code < NXOPCODES) &&
  261. !         (errBitmask & errorTable[event->request_code].ignore))
  262. X          return 0;
  263. !     else if ((event->request_code >= NXOPCODES) ||
  264. !          (errBitmask & errorTable[event->request_code].warning))
  265. X      {
  266. X                 (void) fprintf(stderr, gettext("olvwm: Warning, X Error: %s\n"),
  267. X                                buffer);
  268. *** BUILD/Imakefile    Sat Jun 13 15:51:00 1992
  269. --- src/Imakefile    Sat Jun 13 15:43:21 1992
  270. ***************
  271. *** 28,34 ****
  272. X  DEPLIBS = 
  273. X  LOCAL_LIBRARIES = $(OLGXLIB) $(XLIB)
  274. X  
  275. ! HEADERS = cmdstream.h defaults.h environ.h events.h             \
  276. X        gettext.h globals.h group.h helpcmd.h i18n.h          \
  277. X        iconimage.h iconmask.h kbdfuncs.h list.h mem.h menu.h \
  278. X        notice.h olcursor.h olgx_impl.h ollocale.h olwm.h     \
  279. --- 28,34 ----
  280. X  DEPLIBS = 
  281. X  LOCAL_LIBRARIES = $(OLGXLIB) $(XLIB)
  282. X  
  283. ! HEADERS = cmdstream.h cursors.h defaults.h environ.h events.h   \
  284. X        gettext.h globals.h group.h helpcmd.h i18n.h          \
  285. X        iconimage.h iconmask.h kbdfuncs.h list.h mem.h menu.h \
  286. X        notice.h olcursor.h olgx_impl.h ollocale.h olwm.h     \
  287. ***************
  288. *** 46,52 ****
  289. X  MISC     = openwin-menu
  290. X  
  291. X  SRCS    = Debug.c Error.c Notice.c Select.c WinInfo.c atom.c \
  292. !       client.c cmdstream.c defaults.c environ.c evbind.c \
  293. X        events.c gettext.c group.c helpsend.c images.c kbdfuncs.c \
  294. X        list.c mem.c menu.c moveresize.c ol_button.c olwm.c olvwmrc.c \
  295. X        properties.c resources.c screen.c services.c slave.c slots.c \
  296. --- 46,52 ----
  297. X  MISC     = openwin-menu
  298. X  
  299. X  SRCS    = Debug.c Error.c Notice.c Select.c WinInfo.c atom.c \
  300. !       client.c cmdstream.c cursors.c defaults.c environ.c evbind.c \
  301. X        events.c gettext.c group.c helpsend.c images.c kbdfuncs.c \
  302. X        list.c mem.c menu.c moveresize.c ol_button.c olwm.c olvwmrc.c \
  303. X        properties.c resources.c screen.c services.c slave.c slots.c \
  304. ***************
  305. *** 58,64 ****
  306. X  
  307. X  OBJS =     \
  308. X        Debug.o Error.o Notice.o Select.o WinInfo.o atom.o \
  309. !           client.o cmdstream.o defaults.o environ.o evbind.o \
  310. X            events.o gettext.o group.o helpsend.o images.o kbdfuncs.o \ 
  311. X            list.o mem.o menu.o moveresize.o ol_button.o olwm.o olvwmrc.o \
  312. X        properties.o resources.o screen.o services.o slave.o slots.o \ 
  313. --- 58,64 ----
  314. X  
  315. X  OBJS =     \
  316. X        Debug.o Error.o Notice.o Select.o WinInfo.o atom.o \
  317. !           client.o cmdstream.o cursors.o defaults.o environ.o evbind.o \
  318. X            events.o gettext.o group.o helpsend.o images.o kbdfuncs.o \ 
  319. X            list.o mem.o menu.o moveresize.o ol_button.o olwm.o olvwmrc.o \
  320. X        properties.o resources.o screen.o services.o slave.o slots.o \ 
  321. diff -c BUILD/Makefile.sunpro src/Makefile.sunpro
  322. *** BUILD/Makefile.sunpro    Sat Jun 13 15:51:00 1992
  323. --- src/Makefile.sunpro    Sat Jun 13 15:43:21 1992
  324. ***************
  325. *** 8,14 ****
  326. X  # to that directory but still want to install the helpfile, set HELPDIR
  327. X  # to some other directory and add that directory to your HELPPATH.
  328. X  # If you don't want to install the help file at all, set HELPDIR to /dev/null.
  329. ! HELPDIR = ${OPENWINHOME}/lib/info
  330. X  
  331. X  # Where to install the man pages:  man1 dir is where olvwm.man will go;
  332. X  # and man5 dir is where olvwmrc.man will go; youmay want to set these
  333. --- 8,14 ----
  334. X  # to that directory but still want to install the helpfile, set HELPDIR
  335. X  # to some other directory and add that directory to your HELPPATH.
  336. X  # If you don't want to install the help file at all, set HELPDIR to /dev/null.
  337. ! HELPDIR = ${OPENWINHOME}/lib/help
  338. X  
  339. X  # Where to install the man pages:  man1 dir is where olvwm.man will go;
  340. X  # and man5 dir is where olvwmrc.man will go; youmay want to set these
  341. ***************
  342. *** 36,42 ****
  343. X  INC = -I${OPENWINHOME}/include
  344. X  CFLAGS = ${INC} ${DEBUG} -DOW_I18N_L3 -DSUNDAE -DSHAPE
  345. X  
  346. ! HEADERS = cmdstream.h defaults.h environ.h events.h gettext.h \
  347. X        globals.h group.h helpcmd.h i18n.h iconimage.h iconmask.h  \
  348. X        kbdfuncs.h list.h mem.h menu.h notice.h olcursor.h         \
  349. X        olgx_impl.h ollocale.h olwm.h patchlevel.h properties.h    \
  350. --- 36,42 ----
  351. X  INC = -I${OPENWINHOME}/include
  352. X  CFLAGS = ${INC} ${DEBUG} -DOW_I18N_L3 -DSUNDAE -DSHAPE
  353. X  
  354. ! HEADERS = cmdstream.h cursors.h defaults.h environ.h events.h gettext.h \
  355. X        globals.h group.h helpcmd.h i18n.h iconimage.h iconmask.h  \
  356. X        kbdfuncs.h list.h mem.h menu.h notice.h olcursor.h         \
  357. X        olgx_impl.h ollocale.h olwm.h patchlevel.h properties.h    \
  358. ***************
  359. *** 43,49 ****
  360. X        resources.h screen.h slots.h st.h virtual.h win.h
  361. X  
  362. X  SRCS = Debug.c Error.c Notice.c Select.c WinInfo.c atom.c client.c \
  363. !     cmdstream.c defaults.c environ.c evbind.c events.c gettext.c \
  364. X      group.c helpsend.c i18n.c kbdfuncs.c list.c mem.c menu.c \
  365. X       moveresize.c olwm.c properties.c resources.c screen.c services.c \
  366. X      slave.c slots.c st.c states.c usermenu.c usleep.c virtual.c \
  367. --- 43,49 ----
  368. X        resources.h screen.h slots.h st.h virtual.h win.h
  369. X  
  370. X  SRCS = Debug.c Error.c Notice.c Select.c WinInfo.c atom.c client.c \
  371. !     cmdstream.c cursors.c defaults.c environ.c evbind.c events.c gettext.c \
  372. X      group.c helpsend.c i18n.c kbdfuncs.c list.c mem.c menu.c \
  373. X       moveresize.c olwm.c properties.c resources.c screen.c services.c \
  374. X      slave.c slots.c st.c states.c usermenu.c usleep.c virtual.c \
  375. ***************
  376. *** 53,59 ****
  377. X      ol_button.c
  378. X  
  379. X  LDFLAGS = -L${OPENWINHOME}/lib
  380. ! LIBS = ${LDFLAGS} -lolgx -lX11 -lXext -ll
  381. X  
  382. X  OBJS = ${SRCS:.c=.o} ${VERSION}
  383. X  
  384. --- 53,59 ----
  385. X      ol_button.c
  386. X  
  387. X  LDFLAGS = -L${OPENWINHOME}/lib
  388. ! LIBS = ${LDFLAGS} -lolgx -lXext -lX11 -ll
  389. X  
  390. X  OBJS = ${SRCS:.c=.o} ${VERSION}
  391. X  
  392. diff -c BUILD/Notice.c src/Notice.c
  393. *** BUILD/Notice.c    Sat Jun 13 15:50:27 1992
  394. --- src/Notice.c    Sat Jun 13 15:43:21 1992
  395. ***************
  396. *** 4,10 ****
  397. X   *      file for terms of the license.
  398. X   */
  399. X  
  400. ! #ident "@(#)Notice.c    1.1 olvwm version 1/3/92"
  401. X  
  402. X  /*
  403. X   * Based on
  404. --- 4,10 ----
  405. X   *      file for terms of the license.
  406. X   */
  407. X  
  408. ! #ident "@(#)Notice.c    1.2 olvwm version 6/13/92"
  409. X  
  410. X  /*
  411. X   * Based on
  412. ***************
  413. *** 338,344 ****
  414. X              /* need to move each line further down the screen */
  415. X              MIN_BOX_TOP + GRV.TextFontInfo->ascent * ( ii + 1 )
  416. X                  + ( MIN_STRING_VSPACE * ii ),
  417. !             0, False, OLGX_NORMAL );
  418. X  
  419. X      /* put buttons in - notice that it's a single row */
  420. X      /* row of buttons should be centered within available space,
  421. --- 338,344 ----
  422. X              /* need to move each line further down the screen */
  423. X              MIN_BOX_TOP + GRV.TextFontInfo->ascent * ( ii + 1 )
  424. X                  + ( MIN_STRING_VSPACE * ii ),
  425. !             0, OLGX_NORMAL );
  426. X  
  427. X      /* put buttons in - notice that it's a single row */
  428. X      /* row of buttons should be centered within available space,
  429. *** BUILD/client.c    Sat Jun 13 15:50:31 1992
  430. --- src/client.c    Sat Jun 13 15:49:02 1992
  431. ***************
  432. *** 7,13 ****
  433. X  /* client.c - functions relating to clients as a whole 
  434. X   */
  435. X  
  436. ! #ident    "@(#)client.c    1.1 olvwm version 1/3/92"
  437. X  
  438. X  /*
  439. X   * Based on
  440. --- 7,13 ----
  441. X  /* client.c - functions relating to clients as a whole 
  442. X   */
  443. X  
  444. ! #ident    "@(#)client.c    1.2 olvwm version 6/13/92"
  445. X  
  446. X  /*
  447. X   * Based on
  448. ***************
  449. *** 111,118 ****
  450. X  * private functions
  451. X  ***************************************************************************/
  452. X  
  453. - static void clientSetBusy();
  454. - 
  455. X  /*
  456. X   * setComposeLed - sets the compose led to the new mode iff different than
  457. X   *           the current mode.
  458. --- 111,116 ----
  459. ***************
  460. *** 375,380 ****
  461. --- 373,379 ----
  462. X      {
  463. X          IconHide(cli, cli->iconwin);
  464. X      }
  465. +     IconUnparent(cli, cli->iconwin);
  466. X  
  467. X      frameInfo = cli->framewin;
  468. X      paneInfo = (WinPane*)(frameInfo->fcore.panewin);
  469. ***************
  470. *** 480,485 ****
  471. --- 479,485 ----
  472. X      }
  473. X  
  474. X      /* destroy the window resources associated with the client */
  475. +     IconUnparent(cli, cli->iconwin);
  476. X      WinCallDestroy(cli);
  477. X  
  478. X      GroupRemove(cli->groupid, cli);
  479. ***************
  480. *** 1159,1165 ****
  481. X  }
  482. X  
  483. X  /*
  484. !  * ClientSetBusy -- the busy state has (possibly) been changed for a client.
  485. X   *    if the client is going from normal to busy:
  486. X   *          mark the client as busy
  487. X   *          put up a busy window
  488. --- 1159,1165 ----
  489. X  }
  490. X  
  491. X  /*
  492. !  * ClientUpdateBusy -- the busy state has (possibly) been changed for a client.
  493. X   *    if the client is going from normal to busy:
  494. X   *          mark the client as busy
  495. X   *          put up a busy window
  496. ***************
  497. *** 1229,1235 ****
  498. X  {
  499. X      List    *l = ActiveClientList;
  500. X      Client    *cli;
  501. - 
  502. X  
  503. X      for (cli = ListEnum(&l); cli != NULL; cli = ListEnum(&l)) {
  504. X          if (cli->framewin && cli->framewin->fcore.panewin &&
  505. --- 1229,1234 ----
  506. diff -c BUILD/evbind.c src/evbind.c
  507. *** BUILD/evbind.c    Sat Jun 13 15:50:33 1992
  508. --- src/evbind.c    Sat Jun 13 15:43:22 1992
  509. ***************
  510. *** 4,10 ****
  511. X   *      file for terms of the license.
  512. X   */
  513. X  
  514. ! #ident    "@(#)evbind.c    1.1 olvwm version 1/3/92"
  515. X  
  516. X  /*
  517. X   * Based on
  518. --- 4,10 ----
  519. X   *      file for terms of the license.
  520. X   */
  521. X  
  522. ! #ident    "@(#)evbind.c    1.2 olvwm version 6/13/92"
  523. X  
  524. X  /*
  525. X   * Based on
  526. ***************
  527. *** 87,94 ****
  528. X      XrmValue value;
  529. X      ModDescriptor *d;
  530. X      unsigned int polyStringToModifier();
  531. -     static XrmBinding bindings[] =
  532. -     { XrmBindTightly, XrmBindTightly, XrmBindTightly };
  533. X  
  534. X      classlist[0] = OpenWinQ;
  535. X      classlist[1] = modClassQ;
  536. --- 87,92 ----
  537. ***************
  538. *** 434,446 ****
  539. X      ACTION_TOGGLE_PIN,        KD_FULL
  540. X  }, {
  541. X      "SuspendMouseless",        "z+Alt",            keySuspend,
  542. !     ACTION_NONE,            KD_BASIC_FULL
  543. X  }, {
  544. X      "ResumeMouseless",        "Z+Alt",            keyResume,
  545. !     ACTION_NONE,            KD_IMMUNE | KD_BASIC_FULL
  546. X  }, {
  547. X      "QuoteNextKey",            "q+Alt",            keyQuoteNext,
  548. !     ACTION_NONE,            KD_BASIC_FULL
  549. X  }, {
  550. X      "Refresh",            "F8+Alt",            KeyRefresh,
  551. X      ACTION_NONE,            KD_FULL
  552. --- 432,444 ----
  553. X      ACTION_TOGGLE_PIN,        KD_FULL
  554. X  }, {
  555. X      "SuspendMouseless",        "z+Alt",            keySuspend,
  556. !     ACTION_NONE,            KD_FULL
  557. X  }, {
  558. X      "ResumeMouseless",        "Z+Alt",            keyResume,
  559. !     ACTION_NONE,            KD_IMMUNE | KD_FULL
  560. X  }, {
  561. X      "QuoteNextKey",            "q+Alt",            keyQuoteNext,
  562. !     ACTION_NONE,            KD_FULL
  563. X  }, {
  564. X      "Refresh",            "F8+Alt",            KeyRefresh,
  565. X      ACTION_NONE,            KD_FULL
  566. ***************
  567. *** 480,485 ****
  568. --- 478,498 ----
  569. X  }, {
  570. X      "RaiseLower",            "L5",         KeyRaiseLowerPointer,
  571. X      ACTION_NONE,            KD_ALWAYS
  572. + }, {
  573. +     "ToggleFullSizeZoomX",        "F3+Alt+Shift",    KeyToggleFullSizeZoomX,
  574. +     ACTION_NONE,            KD_FULL
  575. + }, {
  576. +     "ToggleDragWindow",        "F6+Alt+Shift",    KeyToggleDragWindow,
  577. +     ACTION_NONE,            KD_FULL
  578. + }, {
  579. +     "ToggleMoveGroups",        "g+Alt",           KeyToggleMoveGroups,
  580. +     ACTION_NONE,            KD_FULL
  581. + }, {
  582. +     "ToggleSticky",                "s+Alt",           KeyToggleSticky,
  583. +     ACTION_NONE,            KD_FULL
  584. + }, {
  585. +     "SaveWorkspace",        "F10+Meta+Alt+Shift", KeySaveWorkspace,
  586. +     ACTION_NONE,            KD_ALWAYS
  587. X  },
  588. X  
  589. X  /*
  590. ***************
  591. *** 488,625 ****
  592. X   * modifier are grabbed and are always active, otherwise they fall through
  593. X   * to the no focus window which moves the vdm
  594. X   *
  595. -  * We don't have a nofocus action for R7 and R13 since they already have
  596. -  * an action above
  597. X   */
  598. X     {    "VirtualUp",            "Up+Meta",        KeyMoveVDM,
  599. !     ACTION_UP,            KD_ALWAYS                },
  600. X     {    "HalfUp",            "Up+Shift",        NULLFUNC,
  601. !     ACTION_HALF_UP,                KD_ALWAYS                },
  602. X     {    "VirtualHalfUp",        "Up+Shift+Meta",    KeyMoveVDM,
  603. !     ACTION_HALF_UP,            KD_ALWAYS                },
  604. X     {    "VirtualJumpUp",        "Up+Ctrl+Meta",    KeyMoveVDM,
  605. !     ACTION_JUMP_UP,            KD_ALWAYS                },
  606. X  
  607. X     {    "VirtualDown",            "Down+Meta",    KeyMoveVDM,
  608. !     ACTION_DOWN,            KD_ALWAYS                },
  609. X     {    "HalfDown",            "Down+Shift",    NULLFUNC,
  610. !     ACTION_HALF_DOWN,            KD_ALWAYS                },
  611. X     {    "VirtualHalfDown",        "Down+Shift+Meta",    KeyMoveVDM,
  612. !     ACTION_HALF_DOWN,        KD_ALWAYS                },
  613. X     {    "VirtualJumpDown",        "Down+Ctrl+Meta",    KeyMoveVDM,
  614. !     ACTION_JUMP_DOWN,        KD_ALWAYS                },
  615. X  
  616. X     {    "VirtualLeft",            "Left+Meta",    KeyMoveVDM,
  617. !     ACTION_LEFT,            KD_ALWAYS                },
  618. X     {    "HalfLeft",            "Left+Shift",    NULLFUNC,
  619. !     ACTION_HALF_LEFT,        KD_ALWAYS                },
  620. X     {    "VirtualHalfLeft",        "Left+Shift+Meta",    KeyMoveVDM,
  621. !     ACTION_HALF_LEFT,        KD_ALWAYS                },
  622. X     {    "VirtualJumpLeft",        "Left+Ctrl+Meta",    KeyMoveVDM,
  623. !     ACTION_JUMP_LEFT,        KD_ALWAYS                },
  624. X  
  625. X     {    "VirtualRight",            "Right+Meta",    KeyMoveVDM,
  626. !     ACTION_RIGHT,            KD_ALWAYS                },
  627. X     {    "HalfRight",            "Right+Shift",    NULLFUNC,
  628. !     ACTION_HALF_RIGHT,        KD_ALWAYS                },
  629. X     {    "VirtualHalfRight",        "Right+Shift+Meta",    KeyMoveVDM,
  630. !     ACTION_HALF_RIGHT,        KD_ALWAYS                },
  631. X     {    "VirtualJumpRight",        "Right+Ctrl+Meta",    KeyMoveVDM,
  632. !     ACTION_JUMP_RIGHT,        KD_ALWAYS                },
  633. X  
  634. X     {    "VirtualUpLeft",        "R7+Meta",        KeyMoveVDM,
  635. !     ACTION_UPLEFT,            KD_ALWAYS                },
  636. X     {    "JumpUpLeft",            "R7+Ctrl",        NULLFUNC,
  637. !     ACTION_JUMP_UPLEFT,        KD_ALWAYS                },
  638. X     {    "VirtualJumpUpLeft",        "R7+Ctrl+Meta",    KeyMoveVDM,
  639. !     ACTION_JUMP_UPLEFT,        KD_ALWAYS                },
  640. X     {    "HalfUpLeft",            "R7+Shift",        NULLFUNC,
  641. !     ACTION_HALF_UPLEFT,        KD_ALWAYS                },
  642. X     {    "VirtualHalfUpLeft",        "R7+Shift+Meta",    KeyMoveVDM,
  643. !     ACTION_HALF_UPLEFT,        KD_ALWAYS                },
  644. X  
  645. X     {    "VirtualUpRight",        "R9+Meta",        KeyMoveVDM,
  646. !     ACTION_UPRIGHT,            KD_ALWAYS                },
  647. X     {    "UpRight",            "R9",        NULLFUNC,
  648. !     ACTION_UPRIGHT,            KD_ALWAYS                },
  649. X     {    "JumpUpRight",            "R9+Ctrl",        NULLFUNC,
  650. !     ACTION_JUMP_UPRIGHT,        KD_ALWAYS                },
  651. X     {    "VirtualJumpUpRight",        "R9+Ctrl+Meta",    KeyMoveVDM,
  652. !     ACTION_JUMP_UPRIGHT,        KD_ALWAYS                },
  653. X     {    "HalfUpRight",            "R9+Shift",        NULLFUNC,
  654. !     ACTION_HALF_UPRIGHT,        KD_ALWAYS                },
  655. X     {    "VirtualHalfUpRight",        "R9+Shift+Meta",    KeyMoveVDM,
  656. !     ACTION_HALF_UPRIGHT,        KD_ALWAYS                },
  657. X  
  658. X     {    "VirtualDownLeft",        "R13+Meta",        KeyMoveVDM,
  659. !     ACTION_DOWNLEFT,        KD_ALWAYS                },
  660. X     {    "JumpDownLeft",            "R13+Ctrl",        NULLFUNC,
  661. !     ACTION_JUMP_DOWNLEFT,        KD_ALWAYS                },
  662. X     {    "VirtualJumpDownLeft",        "R13+Ctrl+Meta",    KeyMoveVDM,
  663. !     ACTION_JUMP_DOWNLEFT,        KD_ALWAYS                },
  664. X     {    "HalfDownLeft",            "R13+Shift",    NULLFUNC,
  665. !     ACTION_HALF_DOWNLEFT,        KD_ALWAYS                },
  666. X     {    "VirtualHalfDownLeft",        "R13+Shift+Meta",    KeyMoveVDM,
  667. !     ACTION_HALF_DOWNLEFT,        KD_ALWAYS                },
  668. X  
  669. X     {    "VirtualDownRight",        "R15+Meta",        KeyMoveVDM,
  670. !     ACTION_DOWNRIGHT,        KD_ALWAYS                },
  671. X     {    "DownRight",            "R15",        NULLFUNC,
  672. !     ACTION_DOWNRIGHT,        KD_ALWAYS                },
  673. X     {    "JumpDownRight",        "R15+Ctrl",        NULLFUNC,
  674. !     ACTION_JUMP_DOWNRIGHT,        KD_ALWAYS                },
  675. X     {    "VirtualJumpDownRight",        "R15+Ctrl+Meta",    KeyMoveVDM,
  676. !     ACTION_JUMP_DOWNRIGHT,        KD_ALWAYS                },
  677. X     {    "HalfDownRight",        "R15+Shift",    NULLFUNC,
  678. !     ACTION_HALF_DOWNRIGHT,        KD_ALWAYS                },
  679. X     {    "VirtualHalfDownRight",        "R15+Shift+Meta",    KeyMoveVDM,
  680. !     ACTION_HALF_DOWNRIGHT,        KD_ALWAYS                },
  681. X  
  682. X     {    "VirtualHome",                "R11+Meta",        KeyMoveVDM,
  683. !     ACTION_HOME,                KD_ALWAYS                },
  684. X     {    "GoHome",            "R11",        NULLFUNC,
  685. !     ACTION_HOME,            KD_ALWAYS                },
  686. X  
  687. X     {    "VirtualScreen1",        "F1+Meta",        KeyMoveVDM,
  688. !     ACTION_GOTO_1,            KD_ALWAYS                },
  689. X     {    "Screen1",                "F1",        NULLFUNC,
  690. !     ACTION_GOTO_1,            KD_ALWAYS                },
  691. X     {    "VirtualScreen2",        "F2+Meta",        KeyMoveVDM,
  692. !     ACTION_GOTO_2,            KD_ALWAYS                },
  693. X     {    "Screen2",                "F2",        NULLFUNC,
  694. !     ACTION_GOTO_2,            KD_ALWAYS                },
  695. X     {    "VirtualScreen3",        "F3+Meta",        KeyMoveVDM,
  696. !     ACTION_GOTO_3,            KD_ALWAYS                },
  697. X     {    "Screen3",                "F3",        NULLFUNC,
  698. !     ACTION_GOTO_3,            KD_ALWAYS                },
  699. X     {    "VirtualScreen4",        "F4+Meta",        KeyMoveVDM,
  700. !     ACTION_GOTO_4,            KD_ALWAYS                },
  701. X     {    "Screen4",                "F4",        NULLFUNC,
  702. !     ACTION_GOTO_4,            KD_ALWAYS                },
  703. X     {    "VirtualScreen5",        "F5+Meta",        KeyMoveVDM,
  704. !     ACTION_GOTO_5,            KD_ALWAYS                },
  705. X     {    "Screen5",                "F5",        NULLFUNC,
  706. !     ACTION_GOTO_5,            KD_ALWAYS                },
  707. X     {    "VirtualScreen6",        "F6+Meta",        KeyMoveVDM,
  708. !     ACTION_GOTO_6,            KD_ALWAYS                },
  709. X     {    "Screen6",                "F6",        NULLFUNC,
  710. !     ACTION_GOTO_6,            KD_ALWAYS                },
  711. X     {    "VirtualScreen7",        "F7+Meta",        KeyMoveVDM,
  712. !     ACTION_GOTO_7,            KD_ALWAYS                },
  713. X     {    "Screen7",                "F7",        NULLFUNC,
  714. !     ACTION_GOTO_7,            KD_ALWAYS                },
  715. X     {    "VirtualScreen8",        "F8+Meta",        KeyMoveVDM,
  716. !     ACTION_GOTO_8,            KD_ALWAYS                },
  717. X     {    "Screen8",                "F8",        NULLFUNC,
  718. !     ACTION_GOTO_8,            KD_ALWAYS                },
  719. X     {    "VirtualScreen9",        "F9+Meta",        KeyMoveVDM,
  720. !     ACTION_GOTO_9,            KD_ALWAYS                },
  721. X     {    "Screen9",                "F9",        NULLFUNC,
  722. !     ACTION_GOTO_9,            KD_ALWAYS                },
  723. X     {    "VirtualScreen10",        "F10+Meta",        KeyMoveVDM,
  724. !     ACTION_GOTO_10,            KD_ALWAYS                },
  725. X     {    "Screen10",                "F10",        NULLFUNC,
  726. !     ACTION_GOTO_10,            KD_ALWAYS                },
  727. X  };
  728. X  
  729. X  #define NUMKEYDESCRIPTORS (sizeof(KeyDescriptorTable)/sizeof(KeyDescriptor))
  730. --- 501,640 ----
  731. X   * modifier are grabbed and are always active, otherwise they fall through
  732. X   * to the no focus window which moves the vdm
  733. X   *
  734. X   */
  735. X     {    "VirtualUp",            "Up+Meta",        KeyMoveVDM,
  736. !     ACTION_UP,            KD_VIRTUAL                },
  737. X     {    "HalfUp",            "Up+Shift",        NULLFUNC,
  738. !     ACTION_HALF_UP,                KD_VIRTUAL                },
  739. X     {    "VirtualHalfUp",        "Up+Shift+Meta",    KeyMoveVDM,
  740. !     ACTION_HALF_UP,            KD_VIRTUAL                },
  741. X     {    "VirtualJumpUp",        "Up+Ctrl+Meta",    KeyMoveVDM,
  742. !     ACTION_JUMP_UP,            KD_VIRTUAL                },
  743. X  
  744. X     {    "VirtualDown",            "Down+Meta",    KeyMoveVDM,
  745. !     ACTION_DOWN,            KD_VIRTUAL                },
  746. X     {    "HalfDown",            "Down+Shift",    NULLFUNC,
  747. !     ACTION_HALF_DOWN,            KD_VIRTUAL                },
  748. X     {    "VirtualHalfDown",        "Down+Shift+Meta",    KeyMoveVDM,
  749. !     ACTION_HALF_DOWN,        KD_VIRTUAL                },
  750. X     {    "VirtualJumpDown",        "Down+Ctrl+Meta",    KeyMoveVDM,
  751. !     ACTION_JUMP_DOWN,        KD_VIRTUAL                },
  752. X  
  753. X     {    "VirtualLeft",            "Left+Meta",    KeyMoveVDM,
  754. !     ACTION_LEFT,            KD_VIRTUAL                },
  755. X     {    "HalfLeft",            "Left+Shift",    NULLFUNC,
  756. !     ACTION_HALF_LEFT,        KD_VIRTUAL                },
  757. X     {    "VirtualHalfLeft",        "Left+Shift+Meta",    KeyMoveVDM,
  758. !     ACTION_HALF_LEFT,        KD_VIRTUAL                },
  759. X     {    "VirtualJumpLeft",        "Left+Ctrl+Meta",    KeyMoveVDM,
  760. !     ACTION_JUMP_LEFT,        KD_VIRTUAL                },
  761. X  
  762. X     {    "VirtualRight",            "Right+Meta",    KeyMoveVDM,
  763. !     ACTION_RIGHT,            KD_VIRTUAL                },
  764. X     {    "HalfRight",            "Right+Shift",    NULLFUNC,
  765. !     ACTION_HALF_RIGHT,        KD_VIRTUAL                },
  766. X     {    "VirtualHalfRight",        "Right+Shift+Meta",    KeyMoveVDM,
  767. !     ACTION_HALF_RIGHT,        KD_VIRTUAL                },
  768. X     {    "VirtualJumpRight",        "Right+Ctrl+Meta",    KeyMoveVDM,
  769. !     ACTION_JUMP_RIGHT,        KD_VIRTUAL                },
  770. X  
  771. +    {    "UpLeft",            "R7",        NULLFUNC,
  772. +     ACTION_UPLEFT,            KD_VIRTUAL                },
  773. X     {    "VirtualUpLeft",        "R7+Meta",        KeyMoveVDM,
  774. !     ACTION_UPLEFT,            KD_VIRTUAL                },
  775. X     {    "JumpUpLeft",            "R7+Ctrl",        NULLFUNC,
  776. !     ACTION_JUMP_UPLEFT,        KD_VIRTUAL                },
  777. X     {    "VirtualJumpUpLeft",        "R7+Ctrl+Meta",    KeyMoveVDM,
  778. !     ACTION_JUMP_UPLEFT,        KD_VIRTUAL                },
  779. X     {    "HalfUpLeft",            "R7+Shift",        NULLFUNC,
  780. !     ACTION_HALF_UPLEFT,        KD_VIRTUAL                },
  781. X     {    "VirtualHalfUpLeft",        "R7+Shift+Meta",    KeyMoveVDM,
  782. !     ACTION_HALF_UPLEFT,        KD_VIRTUAL                },
  783. X  
  784. X     {    "VirtualUpRight",        "R9+Meta",        KeyMoveVDM,
  785. !     ACTION_UPRIGHT,            KD_VIRTUAL                },
  786. X     {    "UpRight",            "R9",        NULLFUNC,
  787. !     ACTION_UPRIGHT,            KD_VIRTUAL                },
  788. X     {    "JumpUpRight",            "R9+Ctrl",        NULLFUNC,
  789. !     ACTION_JUMP_UPRIGHT,        KD_VIRTUAL                },
  790. X     {    "VirtualJumpUpRight",        "R9+Ctrl+Meta",    KeyMoveVDM,
  791. !     ACTION_JUMP_UPRIGHT,        KD_VIRTUAL                },
  792. X     {    "HalfUpRight",            "R9+Shift",        NULLFUNC,
  793. !     ACTION_HALF_UPRIGHT,        KD_VIRTUAL                },
  794. X     {    "VirtualHalfUpRight",        "R9+Shift+Meta",    KeyMoveVDM,
  795. !     ACTION_HALF_UPRIGHT,        KD_VIRTUAL                },
  796. X  
  797. +    {    "DownLeft",            "R13",        NULLFUNC,
  798. +     ACTION_DOWNLEFT,        KD_VIRTUAL                },
  799. X     {    "VirtualDownLeft",        "R13+Meta",        KeyMoveVDM,
  800. !     ACTION_DOWNLEFT,        KD_VIRTUAL                },
  801. X     {    "JumpDownLeft",            "R13+Ctrl",        NULLFUNC,
  802. !     ACTION_JUMP_DOWNLEFT,        KD_VIRTUAL                },
  803. X     {    "VirtualJumpDownLeft",        "R13+Ctrl+Meta",    KeyMoveVDM,
  804. !     ACTION_JUMP_DOWNLEFT,        KD_VIRTUAL                },
  805. X     {    "HalfDownLeft",            "R13+Shift",    NULLFUNC,
  806. !     ACTION_HALF_DOWNLEFT,        KD_VIRTUAL                },
  807. X     {    "VirtualHalfDownLeft",        "R13+Shift+Meta",    KeyMoveVDM,
  808. !     ACTION_HALF_DOWNLEFT,        KD_VIRTUAL                },
  809. X  
  810. X     {    "VirtualDownRight",        "R15+Meta",        KeyMoveVDM,
  811. !     ACTION_DOWNRIGHT,        KD_VIRTUAL                },
  812. X     {    "DownRight",            "R15",        NULLFUNC,
  813. !     ACTION_DOWNRIGHT,        KD_VIRTUAL                },
  814. X     {    "JumpDownRight",        "R15+Ctrl",        NULLFUNC,
  815. !     ACTION_JUMP_DOWNRIGHT,        KD_VIRTUAL                },
  816. X     {    "VirtualJumpDownRight",        "R15+Ctrl+Meta",    KeyMoveVDM,
  817. !     ACTION_JUMP_DOWNRIGHT,        KD_VIRTUAL                },
  818. X     {    "HalfDownRight",        "R15+Shift",    NULLFUNC,
  819. !     ACTION_HALF_DOWNRIGHT,        KD_VIRTUAL                },
  820. X     {    "VirtualHalfDownRight",        "R15+Shift+Meta",    KeyMoveVDM,
  821. !     ACTION_HALF_DOWNRIGHT,        KD_VIRTUAL                },
  822. X  
  823. X     {    "VirtualHome",                "R11+Meta",        KeyMoveVDM,
  824. !     ACTION_HOME,                KD_VIRTUAL                },
  825. X     {    "GoHome",            "R11",        NULLFUNC,
  826. !     ACTION_HOME,            KD_VIRTUAL                },
  827. X  
  828. X     {    "VirtualScreen1",        "F1+Meta",        KeyMoveVDM,
  829. !     ACTION_GOTO_1,            KD_VIRTUAL                },
  830. X     {    "Screen1",                "F1",        NULLFUNC,
  831. !     ACTION_GOTO_1,            KD_VIRTUAL                },
  832. X     {    "VirtualScreen2",        "F2+Meta",        KeyMoveVDM,
  833. !     ACTION_GOTO_2,            KD_VIRTUAL                },
  834. X     {    "Screen2",                "F2",        NULLFUNC,
  835. !     ACTION_GOTO_2,            KD_VIRTUAL                },
  836. X     {    "VirtualScreen3",        "F3+Meta",        KeyMoveVDM,
  837. !     ACTION_GOTO_3,            KD_VIRTUAL                },
  838. X     {    "Screen3",                "F3",        NULLFUNC,
  839. !     ACTION_GOTO_3,            KD_VIRTUAL                },
  840. X     {    "VirtualScreen4",        "F4+Meta",        KeyMoveVDM,
  841. !     ACTION_GOTO_4,            KD_VIRTUAL                },
  842. X     {    "Screen4",                "F4",        NULLFUNC,
  843. !     ACTION_GOTO_4,            KD_VIRTUAL                },
  844. X     {    "VirtualScreen5",        "F5+Meta",        KeyMoveVDM,
  845. !     ACTION_GOTO_5,            KD_VIRTUAL                },
  846. X     {    "Screen5",                "F5",        NULLFUNC,
  847. !     ACTION_GOTO_5,            KD_VIRTUAL                },
  848. X     {    "VirtualScreen6",        "F6+Meta",        KeyMoveVDM,
  849. !     ACTION_GOTO_6,            KD_VIRTUAL                },
  850. X     {    "Screen6",                "F6",        NULLFUNC,
  851. !     ACTION_GOTO_6,            KD_VIRTUAL                },
  852. X     {    "VirtualScreen7",        "F7+Meta",        KeyMoveVDM,
  853. !     ACTION_GOTO_7,            KD_VIRTUAL                },
  854. X     {    "Screen7",                "F7",        NULLFUNC,
  855. !     ACTION_GOTO_7,            KD_VIRTUAL                },
  856. X     {    "VirtualScreen8",        "F8+Meta",        KeyMoveVDM,
  857. !     ACTION_GOTO_8,            KD_VIRTUAL                },
  858. X     {    "Screen8",                "F8",        NULLFUNC,
  859. !     ACTION_GOTO_8,            KD_VIRTUAL                },
  860. X     {    "VirtualScreen9",        "F9+Meta",        KeyMoveVDM,
  861. !     ACTION_GOTO_9,            KD_VIRTUAL                },
  862. X     {    "Screen9",                "F9",        NULLFUNC,
  863. !     ACTION_GOTO_9,            KD_VIRTUAL                },
  864. X     {    "VirtualScreen10",        "F10+Meta",        KeyMoveVDM,
  865. !     ACTION_GOTO_10,            KD_VIRTUAL                },
  866. X     {    "Screen10",                "F10",        NULLFUNC,
  867. !     ACTION_GOTO_10,            KD_VIRTUAL                },
  868. X  };
  869. X  
  870. X  #define NUMKEYDESCRIPTORS (sizeof(KeyDescriptorTable)/sizeof(KeyDescriptor))
  871. ***************
  872. *** 1000,1017 ****
  873. X   * root window.  Run through the binding table and un/grab the key-modifier
  874. X   * combination itself, and also combined with the Lock and NumLock (if any)
  875. X   * modifier.  There thus may be up to four actual grabs per key binding.
  876. X   */
  877. X  static void
  878. ! grabRootKeys(dpy, root, grab)
  879. X      Display *dpy;
  880. X      Window root;
  881. X      Bool grab;        /* True = grab, False = release */
  882. X  {
  883. X      KeyBinding *k;
  884. X      unsigned int NumLockMask =
  885. X      FindModifierMask(XKeysymToKeycode(dpy, XK_Num_Lock));
  886. X      for (k=KeyBindingTable; k < KeyBindingTable+bindingTableCount; ++k) {
  887. !     if (k->desc->function != NULLFUNC) {
  888. X          if (grab) {
  889. X          XGrabKey(dpy, k->keycode, k->modstate,
  890. X               root, False, GrabModeAsync, GrabModeSync);
  891. --- 1015,1038 ----
  892. X   * root window.  Run through the binding table and un/grab the key-modifier
  893. X   * combination itself, and also combined with the Lock and NumLock (if any)
  894. X   * modifier.  There thus may be up to four actual grabs per key binding.
  895. +  *
  896. +  * If virtual_only is true, we only grab the virtual root keys; this is
  897. +  * e.g. when .olvwmrc changes the keys we're interested in.
  898. X   */
  899. X  static void
  900. ! grabRootKeys(dpy, root, grab, virtual_only)
  901. X      Display *dpy;
  902. X      Window root;
  903. X      Bool grab;        /* True = grab, False = release */
  904. +     Bool virtual_only;
  905. X  {
  906. X      KeyBinding *k;
  907. X      unsigned int NumLockMask =
  908. X      FindModifierMask(XKeysymToKeycode(dpy, XK_Num_Lock));
  909. + 
  910. X      for (k=KeyBindingTable; k < KeyBindingTable+bindingTableCount; ++k) {
  911. !     if (k->desc->function != NULLFUNC &&
  912. !         (!virtual_only || k->desc->action == ACTION_VIRTUAL)) {
  913. X          if (grab) {
  914. X          XGrabKey(dpy, k->keycode, k->modstate,
  915. X               root, False, GrabModeAsync, GrabModeSync);
  916. ***************
  917. *** 1231,1247 ****
  918. X   * grab = False, release the keys.  Note: the screens and the keyboard binding 
  919. X   * information must be initialized prior to calling this function.
  920. X   */
  921. X  void
  922. ! GrabKeys(dpy, grab)
  923. X      Display *dpy;
  924. X      Bool grab;
  925. X  {
  926. X      List *l = ScreenInfoList;
  927. X      ScreenInfo *scr;
  928. X      for (scr = ListEnum(&l); scr != NULL; scr = ListEnum(&l))
  929. !     grabRootKeys(dpy, scr->rootid, grab);
  930. X  }
  931. X  
  932. X  
  933. X  /*
  934. X   * Remove all key grabs, zero out the binding table, and rebuild it from the 
  935. --- 1252,1277 ----
  936. X   * grab = False, release the keys.  Note: the screens and the keyboard binding 
  937. X   * information must be initialized prior to calling this function.
  938. X   */
  939. + 
  940. X  void
  941. ! GrabVKeys(dpy, grab, virtual_only)
  942. X      Display *dpy;
  943. X      Bool grab;
  944. +     Bool virtual_only;
  945. X  {
  946. X      List *l = ScreenInfoList;
  947. X      ScreenInfo *scr;
  948. X      for (scr = ListEnum(&l); scr != NULL; scr = ListEnum(&l))
  949. !     grabRootKeys(dpy, scr->rootid, grab, virtual_only);
  950. X  }
  951. X  
  952. + void
  953. + GrabKeys(dpy, grab)
  954. +     Display *dpy;
  955. +     Bool grab;
  956. + {
  957. +     GrabVKeys(dpy, grab, False);
  958. + }
  959. X  
  960. X  /*
  961. X   * Remove all key grabs, zero out the binding table, and rebuild it from the 
  962. ***************
  963. *** 1306,1312 ****
  964. --- 1336,1349 ----
  965. X      Bool regrab = False;
  966. X      static XrmBinding bindings[] =
  967. X      { XrmBindTightly, XrmBindTightly, XrmBindTightly };
  968. +     int    size = sizeof(mouselessMaskTable) / sizeof(mouselessMaskTable[0]);
  969. +     int    i;
  970. X  
  971. +     if (GRV.GrabVirtualKeys)
  972. +         for (i = 0; i < size; i++)
  973. +         mouselessMaskTable[i] |= KD_VIRTUAL;
  974. +      else for (i = 0; i < size; i++)
  975. +         mouselessMaskTable[i] &= ~KD_VIRTUAL;
  976. X      GrabButtons(dpy, False);
  977. X      establishModBindings(dpy, newDB);
  978. X      GrabButtons(dpy, True);
  979. ***************
  980. *** 1374,1379 ****
  981. --- 1411,1419 ----
  982. X  InitBindings(dpy)
  983. X      Display *dpy;
  984. X  {
  985. + int    size = sizeof(mouselessMaskTable) / sizeof(mouselessMaskTable[0]);
  986. + int    i;
  987. + 
  988. X      kbdCmdInstanceQ = XrmStringToQuark("keyboardCommand");
  989. X      kbdCmdClassQ    = XrmStringToQuark("KeyboardCommand");
  990. X  
  991. ***************
  992. *** 1380,1387 ****
  993. --- 1420,1458 ----
  994. X      modInstanceQ    = XrmStringToQuark("modifier");
  995. X      modClassQ        = XrmStringToQuark("Modifier");
  996. X  
  997. +     if (GRV.GrabVirtualKeys)
  998. +         for (i = 0; i < size; i++)
  999. +         mouselessMaskTable[i] |= KD_VIRTUAL;
  1000. X      KeyBindingTable = MemCalloc(KEYBINDING_TABLE_SIZE,sizeof(KeyBinding));
  1001. X      bindingTableSize = KEYBINDING_TABLE_SIZE;
  1002. X      establishKeyBindings(dpy);
  1003. X      establishModBindings(dpy, OlwmDB);
  1004. + }
  1005. + 
  1006. + /*
  1007. +  * Disable/Enable program keys in given range
  1008. +  */
  1009. + void
  1010. + SetProgKeys(dpy, start_sym, end_sym, modstate, off)
  1011. +     Display *dpy;
  1012. +     KeySym start_sym;
  1013. +     KeySym end_sym;
  1014. +     unsigned long modstate;
  1015. +     Boolean off;
  1016. + {
  1017. +     KeyBinding *k;
  1018. +     KeySym keysym;
  1019. +     extern CheckForKeyProg();
  1020. + 
  1021. +     for(k=KeyBindingTable; k < KeyBindingTable+bindingTableCount; ++k) {
  1022. +       if (k->desc->action == ACTION_VIRTUAL) {
  1023. +           keysym = XKeycodeToKeysym(dpy, k->keycode, 0);
  1024. +           if ((modstate == 0L || (k->modstate & modstate))
  1025. +                   && (start_sym == NoSymbol || keysym >= start_sym)
  1026. +                   && (end_sym == NoSymbol || keysym <= end_sym)) {
  1027. +               k->desc->function =
  1028. +                   off ? NULLFUNC : (void (*)()) CheckForKeyProg;
  1029. +           }
  1030. +       }
  1031. +     }
  1032. X  }
  1033. *** BUILD/events.c    Sat Jun 13 15:50:17 1992
  1034. --- src/events.c    Sat Jun 13 15:43:22 1992
  1035. ***************
  1036. *** 4,10 ****
  1037. X   *      file for terms of the license.
  1038. X   */
  1039. X  
  1040. ! #ident "@(#)events.c    1.1 olvwm version 1/3/92"
  1041. X  
  1042. X  /*
  1043. X   * Based on
  1044. --- 4,10 ----
  1045. X   *      file for terms of the license.
  1046. X   */
  1047. X  
  1048. ! #ident "@(#)events.c    1.2 olvwm version 6/13/92"
  1049. X  
  1050. X  /*
  1051. X   * Based on
  1052. ***************
  1053. *** 435,446 ****
  1054. X           *
  1055. X           * All device events (mouse and keyboard events) have types
  1056. X           * that fall in between KeyPress and MotionNotify.
  1057. X           */
  1058. X          if (event.xany.send_event
  1059. X              && event.type <= MotionNotify
  1060. !             && event.type >= KeyPress)
  1061. X              continue;
  1062. ! 
  1063. X  
  1064. X          /*
  1065. X           * Handle MappingNotify events.  These events don't have 
  1066. --- 435,457 ----
  1067. X           *
  1068. X           * All device events (mouse and keyboard events) have types
  1069. X           * that fall in between KeyPress and MotionNotify.
  1070. +          *
  1071. +          * But, if we allow synthetic events if the correct resource
  1072. +          * is set
  1073. X           */
  1074. X          if (event.xany.send_event
  1075. X              && event.type <= MotionNotify
  1076. !             && event.type >= KeyPress
  1077. !             && (!GRV.AllowSyntheticEvents ||
  1078. !                 !GRV.SyntheticEvents))
  1079. X              continue;
  1080. !         
  1081. !         /*
  1082. !          * If its a function key, see if we need to ReRead olvwmrc
  1083. !          */
  1084. !         if ((event.type == KeyPress) && GRV.VirtualReRead &&
  1085. !             IsFunctionKey(XLookupKeysym(&event, 0)))
  1086. !             CheckOlvwmRC(dpy);
  1087. X  
  1088. X          /*
  1089. X           * Handle MappingNotify events.  These events don't have 
  1090. *** BUILD/gettext.c    Sat Jun 13 15:50:08 1992
  1091. --- src/gettext.c    Sat Jun 13 15:43:22 1992
  1092. ***************
  1093. *** 1,7 ****
  1094. --- 1,13 ----
  1095. X  /*    Copyright (c) 1990 Sun Microsystems    */
  1096. X  /*      All Rights Reserved      */
  1097. X  
  1098. + #ident  "@(#)gettext.c    1.2 olvwm version 6/13/92"
  1099. + 
  1100. + /*
  1101. +  * Based on
  1102. X  #ident    "@(#)gettext.c    1.7    91/09/14 SMI"
  1103. +  *
  1104. +  */
  1105. X  
  1106. X  #ifdef SUNDAE
  1107. X  
  1108. ***************
  1109. *** 236,242 ****
  1110. X  gettext(msg_id)
  1111. X  char *msg_id;
  1112. X  {
  1113. !     return (dgettext(NULL, msg_id));
  1114. X  }
  1115. X  
  1116. X  
  1117. --- 242,250 ----
  1118. X  gettext(msg_id)
  1119. X  char *msg_id;
  1120. X  {
  1121. !     if (msg_id)
  1122. !         return (dgettext(NULL, msg_id));
  1123. !     return NULL;
  1124. X  }
  1125. X  
  1126. X  
  1127. *** BUILD/globals.h    Sat Jun 13 15:51:00 1992
  1128. --- src/globals.h    Sat Jun 13 15:43:23 1992
  1129. ***************
  1130. *** 4,10 ****
  1131. X   *      file for terms of the license.
  1132. X   */
  1133. X  
  1134. ! #ident    "@(#)globals.h    1.2 olvwm version 1/27/92"
  1135. X  
  1136. X  /*
  1137. X   * Based on
  1138. --- 4,10 ----
  1139. X   *      file for terms of the license.
  1140. X   */
  1141. X  
  1142. ! #ident    "@(#)globals.h    1.3 olvwm version 6/13/92"
  1143. X  
  1144. X  /*
  1145. X   * Based on
  1146. ***************
  1147. *** 27,32 ****
  1148. --- 27,34 ----
  1149. X  
  1150. X  typedef enum { UseNone, UseVDM, UseAll } ImageType;
  1151. X  
  1152. + typedef enum { SortYounger, SortAlpha } SortType;
  1153. + 
  1154. X  typedef struct _globalResourceVariables {
  1155. X      char        *WorkspaceColor;
  1156. X      char        *WindowColor;
  1157. ***************
  1158. *** 162,167 ****
  1159. --- 164,199 ----
  1160. X      Bool        VirtualMoveGroups;
  1161. X      Bool        PointerWorkspace;
  1162. X      char        *SaveWorkspaceCmd;
  1163. +     SortType    VirtualMenuSort;
  1164. +     SortType    VirtualDirSort;
  1165. + 
  1166. +      /* Special resize cursors */
  1167. +     char            *SpecialResizePointerData;
  1168. +     Bool            SpecialResizePointers;
  1169. +     Cursor          CornerPointers[4];
  1170. +     Cursor          ResizePointers[4];
  1171. +      /* Other Cursors */
  1172. +     Cursor          CloseUpPointer;
  1173. +     Cursor          CloseDownPointer;
  1174. +     char            *BasicPointerData;
  1175. +     char            *MovePointerData;
  1176. +     char            *BusyPointerData;
  1177. +     char            *IconPointerData;
  1178. +     char            *ResizePointerData;
  1179. +     char            *MenuPointerData;
  1180. +     char            *QuestionPointerData;
  1181. +     char            *TargetPointerData;
  1182. +     char            *PanPointerData;
  1183. +     char            *CloseUpPointerData;
  1184. +     char            *CloseDownPointerData;
  1185. + 
  1186. +     Bool        VirtualReRead;
  1187. +     Bool        AllowSyntheticEvents;
  1188. +     Bool        SyntheticEvents;
  1189. +     List        *NoVirtualKey;
  1190. +     List        *NoVirtualLKey;
  1191. +     List        *NoVirtualFKey;
  1192. +     List        *NoVirtualRKey;
  1193. X  } GlobalResourceVariables;
  1194. X  
  1195. X  extern GlobalResourceVariables    GRV;
  1196. *** BUILD/images.c    Sat Jun 13 15:50:34 1992
  1197. --- src/images.c    Sat Jun 13 15:43:23 1992
  1198. ***************
  1199. *** 3,9 ****
  1200. X   * license
  1201. X   */
  1202. X  
  1203. ! #ident "@(#)images.c    1.1 olvwm version 1/3/92"
  1204. X  
  1205. X  /* Use small images */
  1206. X  #define SMALL_IMAGES
  1207. --- 3,9 ----
  1208. X   * license
  1209. X   */
  1210. X  
  1211. ! #ident "@(#)images.c    1.2 olvwm version 6/13/92"
  1212. X  
  1213. X  /* Use small images */
  1214. X  #define SMALL_IMAGES
  1215. ***************
  1216. *** 717,724 ****
  1217. X  0x00,0x00, 0x20,0x00, 0x50,0x00, 0x88,0x00, 0x04,0x41, 0x08,0x62, 0x10,0x54,
  1218. X  0x20,0x48, 0x40,0x40, 0x80,0x40, 0x00,0x41, 0x80,0x40, 0x40,0x40, 0xe0,0x7f,
  1219. X  };
  1220. - 
  1221. - extern Button    openButton;
  1222. X  
  1223. X  Button *
  1224. X  MakeOpenButton(dpy, scrInfo)
  1225. --- 717,722 ----
  1226. *** BUILD/kbdfuncs.c    Sat Jun 13 15:50:24 1992
  1227. --- src/kbdfuncs.c    Sat Jun 13 15:43:23 1992
  1228. ***************
  1229. *** 4,10 ****
  1230. X   *      file for terms of the license.
  1231. X   */
  1232. X  
  1233. ! #ident    "@(#)kbdfuncs.c    1.1 olvwm version 1/3/92"
  1234. X  
  1235. X  /*
  1236. X   * Based on
  1237. --- 4,10 ----
  1238. X   *      file for terms of the license.
  1239. X   */
  1240. X  
  1241. ! #ident    "@(#)kbdfuncs.c    1.2 olvwm version 6/13/92"
  1242. X  
  1243. X  /*
  1244. X   * Based on
  1245. ***************
  1246. *** 520,525 ****
  1247. --- 520,527 ----
  1248. X       * override-redirect windows.
  1249. X       */
  1250. X      if (childUnderPointer(dpy, ke, &child, &childinfo, &cli)) {
  1251. +     if (cli->wmDecors->flags & WMNoDecor)
  1252. +         return;
  1253. X      if (cli->transientFor != 0 &&
  1254. X          GRV.KeepTransientsAbove &&
  1255. X          (owner = WIGetInfo(cli->transientFor)) != NULL &&
  1256. ***************
  1257. *** 571,577 ****
  1258. X      if (ke->type != KeyPress)
  1259. X      return;
  1260. X  
  1261. !     if (childUnderPointer(dpy, ke, &child, &childinfo, &cli))
  1262. X      ClientOpenCloseToggle(cli);
  1263. X  }
  1264. X  
  1265. --- 573,580 ----
  1266. X      if (ke->type != KeyPress)
  1267. X      return;
  1268. X  
  1269. !     if (childUnderPointer(dpy, ke, &child, &childinfo, &cli) &&
  1270. !         !(cli->wmDecors->flags & WMNoDecor))
  1271. X      ClientOpenCloseToggle(cli);
  1272. X  }
  1273. X  
  1274. ***************
  1275. *** 709,715 ****
  1276. X      if (ke->type != KeyPress)
  1277. X      return;
  1278. X  
  1279. !     if (CurrentClient->framewin != NULL)
  1280. X      ClientFront(CurrentClient);
  1281. X  }
  1282. X  
  1283. --- 712,719 ----
  1284. X      if (ke->type != KeyPress)
  1285. X      return;
  1286. X  
  1287. !     if (CurrentClient->framewin != NULL &&
  1288. !         !(CurrentClient->wmDecors->flags & WMNoDecor))
  1289. X      ClientFront(CurrentClient);
  1290. X  }
  1291. X  
  1292. ***************
  1293. *** 725,731 ****
  1294. X      if (ke->type != KeyPress)
  1295. X      return;
  1296. X  
  1297. !     if (CurrentClient->framewin != NULL)
  1298. X      ClientBack(CurrentClient);
  1299. X  }
  1300. X  
  1301. --- 729,736 ----
  1302. X      if (ke->type != KeyPress)
  1303. X      return;
  1304. X  
  1305. !     if (CurrentClient->framewin != NULL &&
  1306. !         !(CurrentClient->wmDecors->flags & WMNoDecor))
  1307. X      ClientBack(CurrentClient);
  1308. X  }
  1309. X  
  1310. ***************
  1311. *** 741,747 ****
  1312. X      if (ke->type != KeyPress)
  1313. X      return;
  1314. X  
  1315. !     if (CurrentClient->framewin != NULL)
  1316. X      ClientOpenCloseToggle(CurrentClient);
  1317. X  }
  1318. X  
  1319. --- 746,753 ----
  1320. X      if (ke->type != KeyPress)
  1321. X      return;
  1322. X  
  1323. !     if (CurrentClient->framewin != NULL &&
  1324. !         !(CurrentClient->wmDecors->flags & WMNoDecor))
  1325. X      ClientOpenCloseToggle(CurrentClient);
  1326. X  }
  1327. X  
  1328. ***************
  1329. *** 757,763 ****
  1330. X      if (ke->type != KeyPress)
  1331. X      return;
  1332. X  
  1333. !     if (CurrentClient->framewin != NULL)
  1334. X      ClientFullRestoreSizeToggle(CurrentClient);
  1335. X  }
  1336. X  
  1337. --- 763,770 ----
  1338. X      if (ke->type != KeyPress)
  1339. X      return;
  1340. X  
  1341. !     if (CurrentClient->framewin != NULL &&
  1342. !         !(CurrentClient->wmDecors->flags & WMNoDecor))
  1343. X      ClientFullRestoreSizeToggle(CurrentClient);
  1344. X  }
  1345. X  
  1346. ***************
  1347. *** 773,779 ****
  1348. X      if (ke->type != KeyPress)
  1349. X      return;
  1350. X  
  1351. !     if (CurrentClient->framewin != NULL)
  1352. X      ClientKill(CurrentClient, True);
  1353. X  }
  1354. X  
  1355. --- 780,787 ----
  1356. X      if (ke->type != KeyPress)
  1357. X      return;
  1358. X  
  1359. !     if (CurrentClient->framewin != NULL &&
  1360. !         !(CurrentClient->wmDecors->flags & WMNoDecor))
  1361. X      ClientKill(CurrentClient, True);
  1362. X  }
  1363. X  
  1364. ***************
  1365. *** 805,811 ****
  1366. X      if (ke->type != KeyPress)
  1367. X      return;
  1368. X  
  1369. !     if (CurrentClient->framewin != NULL)
  1370. X      ClientMove(CurrentClient,ke);
  1371. X  }
  1372. X  
  1373. --- 813,820 ----
  1374. X      if (ke->type != KeyPress)
  1375. X      return;
  1376. X  
  1377. !     if (CurrentClient->framewin != NULL &&
  1378. !         !(CurrentClient->wmDecors->flags & WMNoDecor))
  1379. X      ClientMove(CurrentClient,ke);
  1380. X  }
  1381. X  
  1382. ***************
  1383. *** 821,827 ****
  1384. X      if (ke->type != KeyPress)
  1385. X      return;
  1386. X  
  1387. !     if (CurrentClient->framewin != NULL)
  1388. X      ClientResize(CurrentClient, ke, keyevent, NULL, NULL);
  1389. X  }
  1390. X  
  1391. --- 830,837 ----
  1392. X      if (ke->type != KeyPress)
  1393. X      return;
  1394. X  
  1395. !     if (CurrentClient->framewin != NULL &&
  1396. !         !(CurrentClient->wmDecors->flags & WMNoDecor))
  1397. X      ClientResize(CurrentClient, ke, keyevent, NULL, NULL);
  1398. X  }
  1399. X  
  1400. ***************
  1401. *** 869,872 ****
  1402. --- 879,949 ----
  1403. X      else  {
  1404. X      ShowStandardMenu(frameInfo, ke, False);
  1405. X      }
  1406. + }
  1407. + 
  1408. +  /*
  1409. +   * Toggle the resource FullSizeZoomX.
  1410. +   */
  1411. + void
  1412. + KeyToggleFullSizeZoomX(dpy, ke)
  1413. +      Display *dpy;
  1414. +      XKeyEvent *ke;
  1415. + {
  1416. +      if (ke->type != KeyPress)
  1417. +      return;
  1418. +      GRV.FullSizeZoomX = !GRV.FullSizeZoomX;
  1419. + }
  1420. + 
  1421. +  /*
  1422. +   * Toggle the resource DragWindow
  1423. +   */
  1424. + void
  1425. + KeyToggleDragWindow(dpy, ke)
  1426. +      Display *dpy;
  1427. +      XKeyEvent *ke;
  1428. + {
  1429. +      if (ke->type != KeyPress)
  1430. +      return;
  1431. +      GRV.DragWindow = !GRV.DragWindow;
  1432. + }
  1433. + 
  1434. +  /*
  1435. +   * Toggle the resource VirtualMoveGroups resource
  1436. +   */
  1437. + void
  1438. + KeyToggleMoveGroups(dpy, ke)
  1439. +      Display *dpy;
  1440. +      XKeyEvent *ke;
  1441. + {
  1442. +      if (ke->type != KeyPress)
  1443. +      return;
  1444. +      GRV.VirtualMoveGroups = !GRV.VirtualMoveGroups;
  1445. + }
  1446. + 
  1447. + /*
  1448. +  * Perform the Stick/Unstick Action
  1449. +  */
  1450. + void
  1451. + KeyToggleSticky(dpy, ke)
  1452. +      Display *dpy;
  1453. +      XKeyEvent *ke;
  1454. + {
  1455. +      if (ke->type != KeyPress)
  1456. +      return;
  1457. +      if (CurrentClient->framewin != NULL &&
  1458. +         !(CurrentClient->wmDecors->flags & WMNoDecor))
  1459. +          ClientStickUnstickToggle(CurrentClient);
  1460. + }
  1461. + 
  1462. + /*
  1463. +  * Save the workspace
  1464. +  */
  1465. + void
  1466. + KeySaveWorkspace(dpy, ev)
  1467. +     Display    *dpy;
  1468. +     XEvent    *ev;
  1469. + {
  1470. +     if (ev->type != KeyPress)
  1471. +     return;
  1472. +     SaveWorkspaceFunc(dpy, lookupWindow(ev), NULL, 0);
  1473. X  }
  1474. *** BUILD/kbdfuncs.h    Sat Jun 13 15:49:44 1992
  1475. --- src/kbdfuncs.h    Sat Jun 13 15:43:24 1992
  1476. ***************
  1477. *** 7,13 ****
  1478. X  #ifndef _OLWM_KBDFUNCS_H
  1479. X  #define _OLWM_KBDFUNCS_H
  1480. X  
  1481. ! #ident    "@(#)kbdfuncs.h    1.1 olvwm version 1/3/92"
  1482. X  
  1483. X  /*
  1484. X   * Based on
  1485. --- 7,13 ----
  1486. X  #ifndef _OLWM_KBDFUNCS_H
  1487. X  #define _OLWM_KBDFUNCS_H
  1488. X  
  1489. ! #ident    "@(#)kbdfuncs.h    1.2 olvwm version 6/13/92"
  1490. X  
  1491. X  /*
  1492. X   * Based on
  1493. ***************
  1494. *** 39,44 ****
  1495. --- 39,49 ----
  1496. X  extern void KeyUnlockColormap();
  1497. X  extern void KeyWindowMenu();
  1498. X  extern void KeyWorkspaceMenu();
  1499. + extern void KeyToggleFullSizeZoomX();  /* Toggle resource FullSizeZoomX. */
  1500. + extern void KeyToggleDragWindow();     /* Toggle resource DragWindow. */
  1501. + extern void KeyToggleMoveGroups();     /* Toggle resource VirtualMoveGroups. */
  1502. + extern void KeyToggleSticky();         /* Toggle Sticky State */
  1503. + extern void KeySaveWorkspace();
  1504. X  
  1505. X  extern void KeyMoveVDM();
  1506. X  extern void AddKeyBinding();
  1507. ***************
  1508. *** 56,61 ****
  1509. --- 61,67 ----
  1510. X  #define KD_SUNVIEW      (1<<1)          /* active if mouseless == SunView */
  1511. X  #define KD_BASIC        (1<<2)          /* active if mouseless == basic */
  1512. X  #define KD_FULL         (1<<3)          /* active if mouseless == full */
  1513. + #define KD_VIRTUAL    (1<<4)        /* active if VirtualGrabKeys == True */
  1514. X  
  1515. X  #define KD_BASIC_FULL   (KD_BASIC | KD_FULL)
  1516. X  #define KD_ALWAYS       (KD_SUNVIEW | KD_BASIC_FULL)
  1517. *** BUILD/menu.c    Sat Jun 13 15:51:01 1992
  1518. --- src/menu.c    Sat Jun 13 15:43:24 1992
  1519. ***************
  1520. *** 4,10 ****
  1521. X   *      file for terms of the license.
  1522. X   */
  1523. X  
  1524. ! #ident    "@(#)menu.c    1.2 olvwm version 1/27/92"
  1525. X  
  1526. X  /*
  1527. X   * Based on
  1528. --- 4,10 ----
  1529. X   *      file for terms of the license.
  1530. X   */
  1531. X  
  1532. ! #ident    "@(#)menu.c    1.3 olvwm version 6/13/92"
  1533. X  
  1534. X  /*
  1535. X   * Based on
  1536. ***************
  1537. *** 545,551 ****
  1538. X  
  1539. X      olgx_draw_text(gisNormal, win, mtit,
  1540. X                 mInfo->titleX, mInfo->titleY, 0,
  1541. !                False, OLGX_NORMAL);
  1542. X  
  1543. X      olgx_draw_text_ledge(gisNormal, win,
  1544. X                   BUTT_HSPACE, mInfo->titleHeight - 6,
  1545. --- 545,551 ----
  1546. X  
  1547. X      olgx_draw_text(gisNormal, win, mtit,
  1548. X                 mInfo->titleX, mInfo->titleY, 0,
  1549. !                OLGX_NORMAL);
  1550. X  
  1551. X      olgx_draw_text_ledge(gisNormal, win,
  1552. X                   BUTT_HSPACE, mInfo->titleHeight - 6,
  1553. ***************
  1554. *** 3201,3212 ****
  1555. X      Menu *menu;
  1556. X      int defitem;
  1557. X      Button *pb;
  1558. X     
  1559. X      /*
  1560. X       * find the menu associated with this frame,
  1561. X       * this ensures that the menu is enabled correctly
  1562. X       */
  1563. !     menu = GetEnabledMenu(win->core.client, win->fcore.fullsize,
  1564. X                  False, win->core.client->sticky);
  1565. X  
  1566. X      if (!menu)
  1567. --- 3201,3216 ----
  1568. X      Menu *menu;
  1569. X      int defitem;
  1570. X      Button *pb;
  1571. +     Bool fullsize;
  1572. X     
  1573. X      /*
  1574. X       * find the menu associated with this frame,
  1575. X       * this ensures that the menu is enabled correctly
  1576. X       */
  1577. !     if (win->core.kind == WIN_FRAME)
  1578. !     fullsize = win->fcore.fullsize;
  1579. !     else fullsize = False;
  1580. SHAR_EOF
  1581. true || echo 'restore of olvwm3.Patch02 failed'
  1582. fi
  1583. echo 'End of  part 1'
  1584. echo 'File olvwm3.Patch02 is continued in part 2'
  1585. echo 2 > _shar_seq_.tmp
  1586. exit 0
  1587. -- 
  1588. ---
  1589. Senior Systems Scientist        mail: dcmartin@msi.com
  1590. Molecular Simulations, Inc.        uucp: uunet!dcmartin
  1591. 796 North Pastoria Avenue        at&t: 408/522-9236
  1592.